//
//  ViewController.m
//  git测试
//
//  Created by Davos on 2017/3/11.
//  Copyright © 2017年 Davos. All rights reserved.
//

#import "ViewController.h"

@interface ViewController ()

@end

@implementation ViewController

- (void)viewDidLoad {
    [super viewDidLoad];
<<<<<<< HEAD
    
    NSLog(@"测试");
=======
    NSLog(@"sjkadhksahdjkash");

    NSLog(@"sjkadhksahdjkash");
    NSLog(@"sjkadhksahdjkash");
    NSLog(@"sjkadhksahdjkash");
    NSLog(@"sjkadhksahdjkash");
    NSLog(@"sjkadhksahdjkash");
    NSLog(@"sadsadasd");
    UIView *view = [[UIView alloc]init];
    NSLog(@"测试");
    
    
    NSLog(@"sjkadhksahdjkash");
    NSLog(@"sadsadasd");
    UIView *view1 = [[UIView alloc]init];
    NSLog(@"测试");

>>>>>>> b49c710871ff726f79d637d7deb2ab38709508f6
}


- (void)didReceiveMemoryWarning {
    [super didReceiveMemoryWarning];
    // Dispose of any resources that can be recreated.
}


@end
